metanorma-un 0.10.3 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41ff83b6e3a4da6dd0d9ecb65321c39aabfcfe70ba20bda707f7ea991ef9eac2
-  data.tar.gz: 709e49ec42a2b2ea48ed225601f2d8a0716cdfdd864d5aec6c775ad454617f1d
+  metadata.gz: 4c9e42af1a46f414fa008f1ac5884187a3100ee721181f36aa02745b8417f5b7
+  data.tar.gz: 9e76d11a8c635570cee7031c255ba07f43cac0ea1cc5749850bfdd8aa8def192
 SHA512:
-  metadata.gz: db75076f8afb99308b895bcd318effaaf271e7c5588334307bf057dd82af901cd62065142a5cc9d13ec99b36609bbb77adc747d18764b4e063ec8ae5651c6580
-  data.tar.gz: 4f7d1c1a7c2295aaab897f2f1322b1d775d8ee1ecb5b2c425752cbd88db67534492cce9a3312654384aebbac3c50f9602761405bace87c524c1220d72560fcae
+  metadata.gz: 3490d782db4f6cbbb2469fcc30964d03305b2af838e8aeefc16eb3d15ead29d37ad7d17d0f14faa8ab6cee6883ca58b174e62cfc607920b34806162379d0fbe8
+  data.tar.gz: a02f9f18408ef70b322840204ddf3c64db71703d0b18c062021835aaaf7351aa204d7ac020263aa2dcad9add6da54053ef4e40b6e5f51df4f4d9a034eed43f52

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

@@ -124,6 +124,10 @@ a.FootnoteRef + a.FootnoteRef:before {
   content: ", ";
   vertical-align: super; }
 
+a.TableFootnoteRef + a.TableFootnoteRef:before {
+  content: ", ";
+  vertical-align: super; }
+
 .addition {
   color: blue; }
 
@@ -431,6 +435,10 @@ p {
     max-width: 100%;
     height: auto; }
 
+table div.figure {
+  padding: 0;
+  margin: 0; }
+
 /*
     Document types + stages
 */

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

@@ -139,6 +139,13 @@ nav {
   @include figureBlock();
 }
 
+table div.figure {
+  padding: 0;
+  margin: 0;
+}
+
+
+
 /*
     Document types + stages
 */

data/lib/isodoc/un/html_convert.rb

@@ -4,7 +4,6 @@ require "isodoc"
 
 module IsoDoc
   module UN
-
     # A {Converter} implementation that generates HTML output, and a document
     # schema encapsulation of the document for validation
     #
@@ -17,14 +16,18 @@ module IsoDoc
       def default_fonts(options)
         {
           bodyfont: (
-            options[:script] == "Hans" ?
-            '"Source Han Sans",serif' :
-            '"Times New Roman", serif'
+            if options[:script] == "Hans"
+              '"Source Han Sans",serif'
+            else
+              '"Times New Roman", serif'
+            end
           ),
           headerfont: (
-            options[:script] == "Hans" ?
-            '"Source Han Sans",sans-serif' :
-            '"Times New Roman", serif'
+            if options[:script] == "Hans"
+              '"Source Han Sans",sans-serif'
+            else
+              '"Times New Roman", serif'
+            end
           ),
           monospacefont: '"Courier New",monospace',
           normalfontsize: "15px",
@@ -40,11 +43,10 @@ module IsoDoc
         }
       end
 
-
       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=Roboto:300,400,400i,500,700,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=Roboto:300,400,400i,500,700,900" rel="stylesheet">
         HEAD
       end
 
@@ -64,7 +66,7 @@ module IsoDoc
       end
 
       def make_body3(body, docxml)
-        body.div **{ class: "main-section" } do |div3|
+        body.div class: "main-section" do |div3|
           boilerplate docxml, div3
           preface_block docxml, div3
           abstract docxml, div3
@@ -88,8 +90,8 @@ module IsoDoc
       def introduction(isoxml, out)
         f = isoxml.at(ns("//introduction")) || return
         page_break(out)
-        out.div **{ class: "Section3", id: f["id"] } do |div|
-          clause_name(nil, f.at(ns("./title")), div, { class: "IntroTitle" })
+        out.div class: "Section3", id: f["id"] do |div|
+          clause_name(f, f.at(ns("./title")), div, { class: "IntroTitle" })
           f.elements.each do |e|
             parse(e, div) unless e.name == "title"
           end
@@ -100,8 +102,8 @@ module IsoDoc
         f = isoxml.at(ns("//foreword")) || return
         page_break(out)
         out.div **attr_code(id: f["id"]) do |s|
-          clause_name(nil, f.at(ns("./title")) || @i18n.foreword, s,
-                    class: "ForewordTitle")
+          clause_name(f, f.at(ns("./title")) || @i18n.foreword, s,
+                      class: "ForewordTitle")
           f.elements.each { |e| parse(e, s) unless e.name == "title" }
         end
       end
@@ -111,4 +113,3 @@ module IsoDoc
     end
   end
 end
-